More unneeded code deleted.