Get things cleaned up and working