Fix #35 by removing useless calls