Remove code which is no longer necessary