Cleaned up charge state