Merge https://github.com/emem123/GrizzlyManager
File cleanup
Merge https://github.com/emem123/GrizzlyManager
Merge https://github.com/emem123/GrizzlyManager