REMOVE: Redundant Poolshare code