removing dead code

removing dead code and moving TODO statements into github issues.