removed all the p statements