makes few clean up to previous commit