Formatting and Warning clean up
Removed unused dependencies