Revert "Update and cleanup"

This reverts commit a9405f98a4d8eba1df25c086829e11f01e3113bf.