Prabin - more cleanup for git