Add roll and join commands, cleanup, and code removal