Some minor fixes solved.

* Also removed non-controlled services and handlers
* All productBundle Repository logic has been deleted