Clean up old role code