remove remnant
deeper refactoring
more detailed report