Revert "controller 2"

This reverts commit a24f2a6dadb1bdfbc5897c518019ffc91531e521.