remove non working code, and uncomment abusively commented lines