Replace NullPointerException with IllegalArgumentException
Remove the author tag
Remove non-functional code around storage locations
Remove more code around storage locations
Revert adding preview
More clean up
Merge pull request #464 from eric-wu/develop

Remove storage location code around