initial cleanup
work continues