Cleaned up unused vars