Active Display: Clean-up code