Some Improvements
Remove not used dependency