Accidentally declared hazards as 'solid blocks'. Fixed
Removed some more old code that was not called by anyone, as well as
removed old out of date TODOs.