remove some unused code
updated to version 0.16.0