Revert "Initial commit part 2"

This reverts commit 9ae01b61194d071aeb75163d0cceeda37f509fdd.