a whole lot of cleanup

messy files were messy.