Cleaning up, mods where made before pulling from latest head