Added "final" removing