Removed boilerplate code
Removed unused global helper