Revert "Loads of updates see in description"

This reverts commit 208d41d169090468fc001e2993d137a0399aceb4.