Remove obsolete code & reinstate hub required for JS test
- #2653