fixed both remove