Cleaned up some stuff project specific stuff that didn't belong in a template