Add silent helper classes
Remove junk I don't use