Cleaning before release

Some general code cleaning before next release