Small refactoring (delete extraneous functions)