More dooyong cleanup