Cleaned up project for new version