1. Assuming you are doing nothing apart from removing the heat sinks, Class C. If you then used the weight to do something else, you need to look at what it is that you are doing to determine the Class.
2. Good catch. For now I'm going to say that, as essentially a structural change, is Class E.