More cleaning before release