Cleaning up some core stuff.