Removed old methods that have been commented out