Removed bad references to non-existent pointers