Clean up dive

Project Aware Clean Up Dive