Clean up dependencies

Fixed a couple issues and cleaned up deps.