Save before removing unused code for future