Removing some useless calls