Cleaning up [#2334511]