Revert "First working commit"

This reverts commit aec0f041398968ce21aa4a15146c6f595e316349.