Enabled module, removed unused code