FACC-Cleanup-042917 - hku60