Clean up and removed debug printfs