Clean up @phamann's mess