Removed unnecessary units inheritance