Clean up from Zach clone 1