Removed global fields and methods