Code cleanup - 3 (Established backward compatability)