clean up in mohawk code