Fixing missing patch from tasky's PR.
Cleaning up unneeded files.
Manually updating versions.