Removed out-of-date code and set old flag to always be true