Cleaned up and updated deps.