CON-366
Cleanup