Remove code that cause complications