Harbor and code cleaning