Class leaks

Class leaks