Cleaned up functions since they don't need to use flatMap/multiMap