Code deletion

Delete more firehose crud, and other cruft. Tested to dev, submission and commenting seems ok. Still a lot more to rip out.