Fixed compile

Removed WotLK code
Fixed tokens/lines forgotten when manually merging
Fixed compatibility with recent core revisions