refactor remove invite
pass handlers up the chain