Revert "consolidate and update"

This reverts commit f1442283da91c54b2eab18606a68d5af13ad1efb.