Remove un-used vars