Delete non used Code
Some Improvements