Removing commented-out code.
Removing atomic version.
Correcting parameters now that channle can be set.