Store old functions for reference
Clean up