Remove some things that appear to be unused