Remove unnecessary internal class