Remove unneccessary calls