Removed all commented code, ~900 lines