removed unneccessary logging, cleanup