a clean up of the interfaces mess