Some clean up in repo