Attempting to remove repository and EventSourceMapper