Updated removal of shares routine
Tidying up
Added implementation of notification support