Small clean up and redundant code removal