remove and rename form partial