Revert using a map for remaining moves
Removes unused elements method