incomplete WIP cleanup, back to working state