Just some cleanup

Title says it all

NO NEED TO REVIEW

Merging.