Removing unnecessary hierarchy