Merge pull request #102 from bartnijssen/fix/issue_99

Fix/issue 99
Removed unused lake-related functions and declarations (issue #103
Merge pull request #104 from bartnijssen/fix/issue_103

Fix/issue #103