Removed additional hierarchy