major cleanup of repo