Patched bug 1030127 and deleted unneeded file