remove deck specific hacks