Let's remove any useless call. It's a critical component after all :)