Merge pull request #1714 from rust-osdev/bishop-status-cleanup

Merge pull request #1714 from rust-osdev/bishop-status-cleanup #900