remove unused class; rename sentinel