Slim down and organize interface

Remove refs to unwanted hardware