Fixed bug - epMUL was already defined
Removed unused code
Macros were renamed in f38a0f65157af628ca5f7706499748c199f0611b