Remove module exceptions for now