Updates to howto files, remove useless stuff
Merge