Code Review

Do Not Merge.

Only for commenting

Delete commented code.