removed non-relevant modules