cleanup
mzed as author