Strip some trivial code