Remove un-used local variables