Strip out tim's stuff