Changed remove code