remove AbstractFactrories for Activity and ActivityBase classes - this combination requires Composition