Remove broken model fields
Merge branch 'master' into cleanup
Added details about working functions