Removed unneeded objects