Remove even more memberof from functions