cleaned up unused variables