Cleaning up for merge
Removed useless space hogs