removed old and wrong code