remove comment + fix warnings