Bump up the version, fix what seem to be unused classes