CON-1379 | Cleanup, changes after CR