removed non-essential module checks