Commit b5b281209749b70fb5e023fce02abb1447de6cfa

Sascha Cunz 2013-01-12T00:07:44

Test: Cleanup some cleaning code