T61 -- COMMIT 41 : Cleaning up.