Code cleanup

[ci skip]