Take out old-style code