Clean up deps
Clean up compile warnings