Beginning cleanup of repo