Forgot to remove old comment conditions