Remove commented block that was causing problems