Reserve functionality clean up