Minor fixes
Removed Wikipedia-specific code

also removed a lot of commented-out code