Removed code redundencies
Removed invalid references