FACC-Cleanups - hku60