Revert "Commit Sprint 2"

This reverts commit 4cddc0058b624c562f7d00ea88ded22db8732797.