Remove some commented out code + add condition for the execution of make publish