remove code properly