Stripped old code