Remove the use of _given fields in the package.erb