some cleanup in lib