Clean up unused fields for the user class