Remove more things that seem broken