Updates

Remove the feature used in java 1.7 to support only for java 1.6