removed faulty stuffs