cleanup to redo from scratch. bold!