really cleaning up core changes