Remove a duplicate targetUnits-, some useless length-checks and unneeded comments. This was SVN commit r17783.