Remove unwanted packages and commented config
Cleaning before real re-write