Removing unnecessary complication from PS1