Issue 192 - Clean up from #153

--HG--
extra : rebase_source : 7538bdf7fdb7f868cc20e30f599b054eb77cff91