Remove unnecessary extractions, fixed board checking code