Cleaner vanilla missing handling