removed unnesesary hierarchies