Remove static_cast