Clean simulator (8/48)

Clean simulator