Removed unecessary activities from controllers