Clean up non-plugin mess.