Remove return in olap