Clean some deps and fix annotations
1.0.2