refactoring, just eliminating some uneeded code