Cleaned up some forever launching code