Remove some uneeded code