Stdlyb cleanup