ERT-561 Clean up