Code cleanup, removed wiki code