s6, Cleaned up the raw MODEL