Moved to try with resource strategy
Cleared up some unused imports and small warnings