Finished first pass at culling unused methods... was not taking generic base types into account before.