Deleted obsolete traits and old shell class