More initial project cleanup.