This is broken out of my "get rid of monitor iface" series and is just the odd cleanups part. johannes