Theres no option to convert and unconvert a rental.
Yes there is. But it's not obvious. Not even anything close to obvious really. You already know how to convert a property from personal use to rental. To convert it back you personal use, you have to work through each individual asset one at a time and select the option for "I stopped using this asset in [taxyear]. When asked for the disposal/sale date, enter the date the last renter vacated the property. On the "Special Handling Required?" screen, select YES. Note that if you select NO then you are telling the program you sold the property and you will be forced to enter sales information. Therefore, you must select YES.
