right in the substrate
remove yet another pointless file
more changes and stuff blah blah blah