Remove some no-longer-needed stuff