Removed old code as part of cleanup