0.3.5 - cleaning update