cleanup for previous fix