cleanup in preparation for adding buttons