Added cleanup code.
Fixed merged issue...