Clean up returncontent classes