More unneeded code removed.