Now deleted the unused code..