Improved performance via merge tag.
Removed some useless stuff