Remove some debug stuff
Support Content-Disposition