Removed Controls and Nested helper classes