(PUP-3271) Remove filebucket support for pson