Remove some logging and minor cleanup