Cleanup, use separate service for data retrieval