memory leak fixed
clean up code before merge to dev
remove unused library