Get rid of use lib, other cleanup