Clean up, an unused feature removal and a bug fix with optimisations on top