remove all warnings
comment more functions