Remove old homeshick/homesick calls