Remove testing (but not working) stuff.