DemoCat code cleanup.