removed duplicates from activity and event controller