MOD: getting rid of unnecessary functions