Removed Unused Code.
Fixed Freeze