Code refactor
Remove php