CON-1771 | Cleanup