Remove cruft
Starting to populate hydra-head some more