2.6 changes and core code cleanup.php