Code cleaning before master release.