Removed unused leftovers.