Cleaning up deprecation warnings in app and unused var warning in test.