Merge "Database: Remove weird commented-out block"