Remove some commented out code
First stab at truly nested modules