clean hierarchy_interpreter.h and depencies