Some cleanup on revised-feature