using evented watch initialize in reprep to clean up call back mess
minor cleanup
updating cleanup state