Clean up dependencies #631