cleanups and remove debug