Removed unnecessary objects