Small cleanups & simplifications
remove excessive logging and some redundancies