Stripped out old REST classes