removed some uneeded code