Removing some references to phone