[controller] cleanup old code
Merge pull request #813 from Chilledheart/cleanup_patch_1

[controller] cleanup old code