Clean up and less logging