Major cleanup of repo