removed old unnecessary code from modules