Doing further cleaning up