cleaned up some cold code