cleanup. no more warnings