cleanup + check for password