remove jquery calls, optimizations