Change version to next minor
Remove redundant definitions
Fix documents