lib/ fix definition and remove junk