[AMOS commit] MDL-20636 Clean up. Committed into Git: 2011-01-27 19:11 UTC