make class names match what is expected and remove unused rubies