Clean simulator (2/48)

Clean simulator