Removed FAST-specific dependencies