Remove problematic code without proper checks but even not needed here