Used correct types for Ids
Removed unnecessary subscribing stuff