Fixed removeDisplay issues