Revert "Final commit"

This reverts commit e7398c66c9bd303f0106c334b34da05aa1bd6176.