Actually remove those things I meant to remove...