Removed some of dependencies on jQuery