Out with the old code and comments