* remove useless defines * minor cleanups fixes bugs #181 and #182 SVN revision: 31805
SVN revision: 27605