code and workflow cleanup