Drakkari Colossus implementation cleanup (cherry picked from commit bc68d013da92f70c20a1dbed16e5c6b8bcba48ae)