#145 #161 #165 #166
cleanup lib