cleanup and try to identify #58