Refactoring

Remove this function.