Removed some unneccessary calls.