Remove things that works now.