Removed unnecessary API classes