Some cleanup and remove of unneeded code.