Much clean up and housekeeping