Revert "New changes and cleanup"

This reverts commit d9f38abc447d64f21f8aa8e3eb64cd842cf29b5f.