Old code cleanup