Unused code cleaning