Remove the not working code