2013-spring-cleanup: DBus cleanup.