Cleaned up commented and unused code from pairing with Carrick 10/15/14

@carrickr