Cleaning up repo for new setup