Removed some unnecessary code

stable release