cleaned up smoke code