cleanup from last revert