Remove stinky code, ref #287
Merge pull request #383 from owncloud/cleanup-file-model

Remove stinky code, ref #287