Removed faulty code