Clean up navigation drawer inheritance