Removed old code. added TODO