Check in code clean up to Services