some cleanup of interface