Relocate commented code to the right location