Begin code cleanup

Remove unused codes before implementing next function