removed dead code for TODO stuff