Clean up code from d3f6fb3