Removed unused variables and expressions