Add option to strip headers from storage