General clean up was required