Bugfix (key parameter in Travel Time Matrix) and cleanup