Removed some finals that aren't needed