Clean up never used variables