removed dead code, documented todo