cleanup, info and log messages added