Many updates
Remove accidental import