cleared pfs_deps and fixes