Removed unneccesary Code
Code improvement
Preparing release v25