remove redundant code; another attempt at making it work on Winders