Removed ActivityCaller

Removed ActivityCalled and some more improvemets