some unnecessary finals removed