cleanup
refactored null controllers out