Continuing to clean up project