removed strange hierarchy of objects