cleaned up waterfall related code to get ready for Qt5.1 to re-implement opengl waterfall