Merge "Removing some duplicate methods" into ub-now-queens