Removed cruft identified through documenting the architecture of BVD