Remove dvdnav, cleanup variable declarations