Take out more non-Lynx code