code clean up and removed extra service reference