Removed some more EPs from mblhandlers.cpp