Removing extra crud from PS1