fix hierarchy test;
remove obsolete files