Cleaned up/removed old unneeded functions