Remove the os_board part in this branch