Remove some unlisted code