Cleaning up lib