Revert "final commit of all changes"

This reverts commit bfba68d103da610afa3aee9b05f788f07fa6da70.
actual final commit