Remove more unused code, fixed BioDalliance