Throwing some unused code away