Commit before ripping out particle system