Removed some uneeded code