faac: rebuild, cleanup