removing some more unneeded code