Fixed issue: Removed gleez namespace
Fixed issue: Cleanup code