Cleaned up unused Instance Vars