removed unused and unneeded code