minor library cleanup