Removed some no longer used code. Updated TODO