MOD: getting rid of an unnecessary function