Completed some housekeeping.