removed old methods that were factored out