Remove not needed of