cleanup some unneeded stuff and missed renames