Moved some very old code to deprecated