Removing hooked handler after initialization
Fixed latest geometry changed and naming refactorings