Cleaned up instance variables that were unnecessary.