Removed unnecessary classes and updated Saucer