Removed Most Commented out code, checked still works