Fixed Up RemoveCommand and JoinListener