Attempt at cleanup of repo