v2.0.5 - cleaning