Cleanup to be closer to core