Remove old, goofball options