GH55 - Cleanup code