Remove unncessary instance variables