Closes #124 Removing e10s legacy code