Removed Mock Service
Code Cleanup