Removed unnecessary base objects