Eliminated service.py