Leak has been corrected

Following changes have been made:
1) Leak has been removed.
2) Unused files have been removed.