Remove temp commenting