Improved Scale mode, removed obsolete code