cleaned out current setup