Clean up

Removes some stuff we don't use, and adds some of our own

Based on our own practices with latest projects