Revert "atom controller"

This reverts commit b0a4ae005e753dba511aacff6d6f06a7df49c953.