Removing files no longer used, updating others

Lots of files are no longer necessary in the new paradigm.