Remove mail in clean-machine
bugs and readme fixed to work with clean install