Full code review

?? 
Remove code that is not useful.