Bump version + cleanup