Jeremy Newman : cleanup