App Service Layer Clean Up