Cleaning up some interfaces