Removed unnecessary abstract classes