remove unecessary saas code
remove unnecessary code
fix merge conflict