Code cleanup. Removing unrelevant TODOs and unused codes that were commented out.