Fixed birdtry regression + some cleanups (nw)