Cleanup
- fix control helper missing function