Removed unessary Module calls.