Got rid of some unused variables for compression