Backend: Cleanup for new PHP code