Merge "Remove base class complex and confusing variable"