Cleaned up dependencies on sretrieve