Remove outdated stuff. Clean up.