Crossings interface cleanup