Another clean up

Last clean up caused bugs