Remove simulation stuff