Cleanup and added XFORMR
Clenanup