Lots of debug/cleaning.
Comment outdated code for minus.