Moved old potentially unneeded code into archive