[WIP] Big cleanup

Delete lots of unused code.

DO NOT MERGE until after bmyerz-myrial . I don't want to cause conflicts in that direction