Removed dependancy on jQuery