refactor - removing ext messages to use inline notifications instead