remove trailing whitespace
Fix deprecation notice.