Optimize classifier sweep mode & cleanup