remove some trivial code