merging mysql fixes
removing excess js