Cleaning up [skip ci]