clean up following sensio labs insight advices