Remove unused code
Update version code and number