cleanup. OK for production