Remove references to obstacle_layer