debuging, cleanup