ERT-685 Clean up