Code cleanup and squashed unload/adjacent prompts for liquids