Tidy up

Still to sort manage subscriptions