[problems] more cleanup