HomeSoftware Heritage

Add some missing type annotations and remove already done TODO's