various clean ups after libebus merging.