ERT-356 - Some cleanup