Remove doc warning and cleaning