some cleanup for new repo