Removed some 1.7 TC4 support until public release (for jenkin build to work