Merge "Style fix and dead code removal"