Removing leftover calls to js
Splitting the sections apart, closes #3