0.3.802 - cleanup