removing a few unneeded code