Remove unnecessary pieces
Depend on the new awizo version