Cleaned up previous commit (removed globals).