less logging and cleanup