Cleaning up a few unused items from the core