Remove more stuff, fix more bugs.