Fix
Changes & Fixes
Fix
Remove unnecessay code