Squashed commits: [a844d37] Remove unnecessary class_name's from models [529a30c] Further adjust authorization and related models