This finally finishes the clean up.
A function has been added in issue patch that which cleans the code on the view side.