Remove unused attributes/methods