Develop

Clean up the commit history by remove unmature WaterFilter.