Finite cleanup

Do we still need it actually?