FIX: removeFiles building on all platforms
REFACTOR: trace APIs