Cleanup from bad fork merge