Remove puts and p statement