Clean up project for Version 2