Cleanup for code execution.
Updating for Symfony-2.3 branch