consolidation

consolidating cleanup