actually removed duck as well as unused variables and some other nonsense