Project cleanup.
Further cleanup