cleanup of be and file consistency