Test Unsubscribe

- also cleaned up some stuff I remembered after merging last commits