Rewrite to remove trouble objects