A little overzelous removing stuff. Works without EAC now