Cleaning up todos and removing the has.hpp helper