Stock, some cleanup