Remove unneeded globals