Take out unused code