0.99.081 Edit cleanup