untabify modules (+ delete some code which was commented out)