initial working set
minimal cleanup