Fleshing out Bus and Device. Cleanup.