Katar Engine Cleanup#4

ashmeet13 wants to merge 2 commits intomainashmeet13/katar:mainfrom

engine_cleanupashmeet13/katar:engine_cleanupCopy head branch name to clipboard