Clean up some rogue global aliases