Revert "Smaller fixes + deleted unnecessary files"

This reverts commit 4e2452bae1fd4740fd0d4d43fa7379a0d276b06e.
Change version