uservoice: cleanup classic logic