Added remove to current display, fixed removeObserver bug