More preparation for PDO
Remove a creole dependency