Clean "models" package for #2