Fixed memory leak
Removed useless class