Remove merge tag and unused function

Should run phing lint before commit.....