More unrequired code removed.