cleanup
remove tmp files
added defs