Removed Service

Changes to remove dependency on the service now. Everything is handled
in broadcast receiver