Cleaned up some code from smoke tests