More clean up of Asset controller before we add in etag and versioning stuff