These calls did belong in dealloc after all