Oh well, now that is has been discussed anyway, added commit to clean this up :) Done.