Remove interwiki reference (not being used)
First set of misc changes, updates and cleanup