cleanup
progress 12/23