Remove unneeded instance variables