remove unnessesary logic
Merge branch 'ph8_dev' into ph8_review