More unneeded code removed