No more Kanada Map. (Part 1)

Change-Id: I0d7cba4dd1e93b3ebd7431eb9c12d1ec4ce5a0bf
Signed-off-by: Stephan <stegiemail-github@yahoo.de>
Finally some trees in good ol' Kanada. (Part 2)

Change-Id: I501a74abff19f4716e07d853ccbf5476e86f7cba
Signed-off-by: Stephan <stegiemail-github@yahoo.de>