add warning, remove redundant info