Changes from NULL to null etc
More cleanup for null and docblock
Remove unwanted js file