Merge "Added remove subscription support"