Removing the Active Record class definitions.
Merge branch 'master' into DS