Removed ResourceT from many unnecessary places