more cleanup for content_type handling