Cleanup+Refactor Suice 2014.