Clean up dependencies

related to !723 (merged)