Review Feedback: Small cleanups.

* Use g_clear_object()
* Remove unnecessary code.