Remove unnecessary proxy classes

Avoids redundant search operations