removed some lines of codes which came up during merge