Removed flawed code