Got rid of unused global variables