Cleanup & fix BoardConfig