Removed files not being used
Fixed memory leakage
merge