Removed dead codes