Remove seperate 2D handler