Removing useless globales