Some more cleaning
3 files changed