Random cleanup that shouldn't have been needed