Revert "W8-A7 fleshed"

This reverts commit 956b98a12b1490429f0b7f7ad17c6d623348db64.