[lib] cleanup