Revert "i hate you. work please"

This reverts commit 50576959268f5b0b5ffb684c6fe9617e28229c80.
clean, updated simulator to 8.0