Merge "Internal::Control cleanup, remove dead an non-needed methods and adding missin...