refactor code to extract general sender
remove unused class