removing case from services and removing empty calls on page load