issues/699: cleanup
Merge pull request #761 from monkeyiq/2013sep/issues/699clean

issues/699: cleanup