Cleaned out some obsolete variables