removed unused code and obsolote TODO comments