Bump code version and cleanup