Cleaning up project.
Cleaning part2.