Update lib, cleanup