Cleaned up unused variables