Add support for trout and cleanup