Further cleanups after removing GrandCentral support