Fixed Issue: Cleanup core Gleez js and fixes