Remove commented and unused codes