Remove trash.
Fix failing tests and extend to show more about usage of markers.