removing not required code