cleaning up some interfaces