Clean up interfaces between classes