Revert "Work on #242, #243, #244, #245 and #246"

This reverts commit 4118c3aa04db1c4ec1b615f4fa5e14ceb9f74b46.