Continued project clean up