Commented out some of the ORM changes

Needed to make the ListMapping serializable, so commented out the
FileSystem code for now.