Cleaning up the system still. Getting ready