Bump add-on version and clean up code