Fixed project and clean up.