[core] Cleaning some PHP unused tags and variables