CON-1468 | Final cleanup