Remove left-over unused variables