removed a lot of commented out stuff.
Merged with Anton