Cleaned up unused/mistyped variables.