Refactor away unecessary code
Update version and description