commented and removed unneeded objects