Fix code smell issues/drop unused PHP code

Change-Id: I7e5a4032d5db9b244fac58f638819004aac7d61e