Removed a huge amount of useless commented code (eww)