Continued cleanup and pdo integration.