Remove logging and stroke colour, rebase has broken...