More warnings and unneeded code removed.