Spring cleaning for this old code base