remove unused future import
fix type error
cleanup