cleanup done, all working