Removed old code leftovers.