Project cleanup

Cleanup resulting from email request for update.