Updating classifiers status to stable and clean up

Change-Id: I72943a9575b873cef1bf193f197b390b544ed6bf