Revert "Improved JS"

This reverts commit 72fcd220d69dc16e51e46a8dce3910174cf9f28b.
Revert "Bunch of changes"

This reverts commit 95d0f4bd4b03da3e29c734524653036849c2749d.
Revert changes master branche pt 1