Cleaning up interfaces