Fixed select moves not in the right state
Clean up