omap: dss/dsscomp: cleanup from merge