Project cleanup

:+1: